Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 3 Sep 2010 06:22:01 +0000 (06:22 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 3 Sep 2010 06:22:01 +0000 (06:22 +0000)

Trivial merge